From: Andreas Tille <tille@debian.org>
Date: Tue, 4 May 2021 05:43:50 +0000 (+0200)
Subject: Rename debian/.gitlab-ci.yml to debian/salsa-ci.yml to use a unique name in all Debia... 
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~131
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ee5e6f20602c8ee84fa7e2b7d08339f7a51ebd2c;p=dcmtk.git

Rename debian/.gitlab-ci.yml to debian/salsa-ci.yml to use a unique name in all Debian Med packages
---

diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
deleted file mode 100644
index 3122a171..00000000
--- a/debian/.gitlab-ci.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-image: debian:sid
-
-build:
-  stage: build
-  before_script:
-    - apt-get update && apt-get -y install devscripts git-buildpackage 
-    - mk-build-deps --tool "apt -y -o Debug::pkgProblemResolver=yes --no-install-recommends" --install -r debian/control
-    - rm *.buildinfo *.changes
-  script:
-    - git checkout pristine-tar 
-    - git pull 
-    - git checkout master 
-    - git pull 
-    # silence build to not exceed build log size of gitlab-ci
-    - gbp buildpackage -uc -us 2>&1 >../build.log && exit 0 || tail -n 100 ../build.log  && exit -1
-
diff --git a/debian/changelog b/debian/changelog
index 4e0bcef6..508e7ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dcmtk (3.6.6-1~ext2) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * Team upload.
   * Remove patches thanks to a hint by Jörg Riesmeier (see #981326)
+  * Rename debian/.gitlab-ci.yml to debian/salsa-ci.yml to use a unique
+    name in all Debian Med packages
 
   [ Mathieu Malaterre ]
   * d/rules: Set ICONV to OFF
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 00000000..3122a171
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,16 @@
+image: debian:sid
+
+build:
+  stage: build
+  before_script:
+    - apt-get update && apt-get -y install devscripts git-buildpackage 
+    - mk-build-deps --tool "apt -y -o Debug::pkgProblemResolver=yes --no-install-recommends" --install -r debian/control
+    - rm *.buildinfo *.changes
+  script:
+    - git checkout pristine-tar 
+    - git pull 
+    - git checkout master 
+    - git pull 
+    # silence build to not exceed build log size of gitlab-ci
+    - gbp buildpackage -uc -us 2>&1 >../build.log && exit 0 || tail -n 100 ../build.log  && exit -1
+